diff --git a/lib/ansible/modules/cloud/atomic/atomic_host.py b/lib/ansible/modules/cloud/atomic/atomic_host.py
index 3a9d860e155..ca38443ef93 100644
--- a/lib/ansible/modules/cloud/atomic/atomic_host.py
+++ b/lib/ansible/modules/cloud/atomic/atomic_host.py
@@ -21,7 +21,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.0',
                     'supported_by': 'community'}
 
 
-DOCUMENTATION='''
+DOCUMENTATION = '''
 ---
 module: atomic_host
 short_description: Manage the atomic host platform
@@ -63,6 +63,10 @@ msg:
     sample: 'Already on latest'
 '''
 
+# import module snippets
+from ansible.module_utils.basic import AnsibleModule, os
+
+
 def core(module):
     revision = module.params['revision']
     args = []
@@ -90,8 +94,8 @@ def core(module):
 
 def main():
     module = AnsibleModule(
-        argument_spec = dict(
-            revision = dict(default='latest', required=False, aliases=["version"]),
+        argument_spec=dict(
+            revision=dict(default='latest', required=False, aliases=["version"]),
             ),
         )
 
@@ -105,7 +109,5 @@ def main():
         module.fail_json(msg=str(e))
 
 
-# import module snippets
-from ansible.module_utils.basic import *
 if __name__ == '__main__':
     main()
diff --git a/lib/ansible/modules/cloud/atomic/atomic_image.py b/lib/ansible/modules/cloud/atomic/atomic_image.py
index 221b6325f2c..8acf59b3fef 100644
--- a/lib/ansible/modules/cloud/atomic/atomic_image.py
+++ b/lib/ansible/modules/cloud/atomic/atomic_image.py
@@ -21,7 +21,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.0',
                     'supported_by': 'community'}
 
 
-DOCUMENTATION='''
+DOCUMENTATION = '''
 ---
 module: atomic_image
 short_description: Manage the container images on the atomic host platform
@@ -73,6 +73,11 @@ msg:
     sample: [u'Using default tag: latest ...']
 '''
 
+
+# import module snippets
+from ansible.module_utils.basic import AnsibleModule
+
+
 def do_upgrade(module, image):
     args = ['atomic', 'update', '--force', image]
     rc, out, err = module.run_command(args, check_rc=False)
@@ -120,10 +125,10 @@ def core(module):
 
 def main():
     module = AnsibleModule(
-        argument_spec = dict(
-            name    = dict(default=None, required=True),
-            state   = dict(default='latest', choices=['present', 'absent', 'latest']),
-            started = dict(default='yes', type='bool'),
+        argument_spec=dict(
+            name=dict(default=None, required=True),
+            state=dict(default='latest', choices=['present', 'absent', 'latest']),
+            started=dict(default='yes', type='bool'),
             ),
         )
 
@@ -138,7 +143,5 @@ def main():
         module.fail_json(msg=str(e))
 
 
-# import module snippets
-from ansible.module_utils.basic import *
 if __name__ == '__main__':
     main()