diff --git a/Makefile b/Makefile
index 58b74b2fb..82aef0cd1 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,9 @@ init:
 	@python setup.py develop
 	@pip install -r requirements.txt
 
+lint:
+	flake8 moto
+
 test:
 	rm -f .coverage
 	rm -rf cover
diff --git a/moto/cloudformation/parsing.py b/moto/cloudformation/parsing.py
index 337de2f2d..fbf34b6f1 100644
--- a/moto/cloudformation/parsing.py
+++ b/moto/cloudformation/parsing.py
@@ -365,7 +365,7 @@ class ResourceMap(collections.Mapping):
                 condition, self._parsed_resources, self.lazy_condition_map)
 
         for condition_name in self.lazy_condition_map:
-            _ = self.lazy_condition_map[condition_name]
+            self.lazy_condition_map[condition_name]
 
     def create(self):
         self.load_mapping()
diff --git a/moto/ec2/models.py b/moto/ec2/models.py
index 6ed6e9af0..87ce61c5b 100755
--- a/moto/ec2/models.py
+++ b/moto/ec2/models.py
@@ -349,7 +349,6 @@ class NetworkInterfaceBackend(object):
         return generic_filter(filters, enis)
 
 
-
 class Instance(TaggedEC2Resource, BotoInstance):
     def __init__(self, ec2_backend, image_id, user_data, security_groups, **kwargs):
         super(Instance, self).__init__()
diff --git a/moto/iam/responses.py b/moto/iam/responses.py
index cd9ddbf75..318c04f3a 100644
--- a/moto/iam/responses.py
+++ b/moto/iam/responses.py
@@ -232,7 +232,6 @@ class IamResponse(BaseResponse):
         template = self.response_template(USER_TEMPLATE)
         return template.render(action='Create', user=user)
 
-
     def get_user(self):
         user_name = self._get_param('UserName')
         user = iam_backend.get_user(user_name)