diff --git a/{{ cookiecutter.repo_name }}/Makefile b/{{ cookiecutter.repo_name }}/Makefile
index c3ef900..04a6738 100644
--- a/{{ cookiecutter.repo_name }}/Makefile	
+++ b/{{ cookiecutter.repo_name }}/Makefile	
@@ -37,9 +37,9 @@ sync_data_from_s3:
 	aws s3 sync s3://$(BUCKET)/data/ data/
 
 ## Set up python interpreter environment
-setup_environment:
+create_environment:
 	source /usr/local/bin/virtualenvwrapper.sh; mkvirtualenv $(PROJECT_NAME) --python=$(PYTHON_INTERPRETER)
-	@echo ">>> Activate virtualenv with:\nworkon $(PROJECT_NAME)"
+	@echo ">>> New virtualenv created. Activate with:\nworkon $(PROJECT_NAME)"
 
 ## Test python environment is setup correctly
 test_environment:
diff --git a/{{ cookiecutter.repo_name }}/test_environment.py b/{{ cookiecutter.repo_name }}/test_environment.py
index ed8c3a9..752c2dc 100644
--- a/{{ cookiecutter.repo_name }}/test_environment.py	
+++ b/{{ cookiecutter.repo_name }}/test_environment.py	
@@ -14,8 +14,9 @@ def main():
             REQUIRED_PYTHON))
 
     if system_major != required_major:
-        raise TypeError("This project requires Python {}. Found: {}".format(
-            required_major, sys.version))
+        raise TypeError(
+            "This project requires Python {}. Found: Python {}".format(
+                required_major, sys.version))
     else:
         print(">>> Development environment passes all tests!")