diff --git a/ec2 b/ec2
index 7d3a141e788..2a239cc2ba7 100644
--- a/ec2
+++ b/ec2
@@ -248,9 +248,7 @@ def main():
             }
         instances.append(d)
 
-    result = {"changed": True,
-              "instances": instances }
-    module.exit_json(**result)
+    module.exit_json(changed=True, instances=instances)
 
 # this is magic, see lib/ansible/module_common.py
 #<<INCLUDE_ANSIBLE_MODULE_COMMON>>
diff --git a/postgresql_db b/postgresql_db
index 73ec8160fb7..09172beed6a 100644
--- a/postgresql_db
+++ b/postgresql_db
@@ -149,7 +149,7 @@ def main():
             encoding=dict(default=""),
             state=dict(default="present", choices=["absent", "present"]),
         ),
-	supports_check_mode = True
+        supports_check_mode = True
     )
 
     if not postgresqldb_found:
diff --git a/postgresql_user b/postgresql_user
index 2191a37f540..53648d1455e 100644
--- a/postgresql_user
+++ b/postgresql_user
@@ -376,7 +376,7 @@ def main():
             fail_on_user=dict(default='yes'),
             role_attr_flags=dict(default='')
         ),
-	supports_check_mode = True
+        supports_check_mode = True
     )
 
     user = module.params["user"]
@@ -419,7 +419,7 @@ def main():
 
         if user_exists(cursor, user):
             if  module.check_mode:  
-		kw['changed'] = True 
+                kw['changed'] = True 
                 module.exit_json(**kw)
 
             changed = user_alter(cursor, user, password, role_attr_flags)
@@ -429,7 +429,7 @@ def main():
                 module.fail_json(msg=msg)
 
             if  module.check_mode:  
-		kw['changed'] = True 
+                kw['changed'] = True 
                 module.exit_json(**kw)
 
             changed = user_add(cursor, user, password, role_attr_flags)
@@ -438,7 +438,7 @@ def main():
 
         if user_exists(cursor, user):
             if  module.check_mode:  
-		kw['changed'] = True 
+                kw['changed'] = True 
                 kw['user_removed'] = True 
                 module.exit_json(**kw)
 
diff --git a/setup b/setup
index 0e0c9a3cf5f..58ec908c2ae 100644
--- a/setup
+++ b/setup
@@ -193,7 +193,7 @@ class Facts(object):
 
         self.facts['os_family'] = self.facts['distribution']
         if self.facts['distribution'] in OS_FAMILY:
-           self.facts['os_family'] = OS_FAMILY[self.facts['distribution']]
+            self.facts['os_family'] = OS_FAMILY[self.facts['distribution']]
 
     def get_cmdline(self):
         data = get_file_content('/proc/cmdline')