diff --git a/emr_list_clusters.py b/emr_list_clusters.py
deleted file mode 100644
index a1938c1..0000000
--- a/emr_list_clusters.py
+++ /dev/null
@@ -1,9 +0,0 @@
-'''
-This file is used to perform some EMR actions
-'''
-from libs.emr import *
-from config import AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY
-
-
-list_clusters(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY)
-list_security_configurations(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY)
diff --git a/lambda_list_functions_and_mappings.py b/lambda_list_functions_and_mappings.py
deleted file mode 100644
index 9b6949e..0000000
--- a/lambda_list_functions_and_mappings.py
+++ /dev/null
@@ -1,8 +0,0 @@
-'''
-This file is used to list lambda functions and event mappings
-'''
-from libs.aws_lambda import *
-from config import AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY
-
-list_functions(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY)
-list_event_source_mappings(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY)
diff --git a/libs/aws_lambda.py b/libs/aws_lambda.py
index fabf78d..fa4f4eb 100644
--- a/libs/aws_lambda.py
+++ b/libs/aws_lambda.py
@@ -4,64 +4,67 @@ lamda functions
 
 import boto3
 import botocore
+import os
 import pprint
-import sys,os
+import sys
 
 pp = pprint.PrettyPrinter(indent=5, width=80)
 
-#from http://docs.aws.amazon.com/general/latest/gr/rande.html
-regions = ['us-east-1', 'us-east-2', 'us-west-1', 'us-west-2', 'ca-central-1', 'eu-central-1', 'eu-west-1', 'eu-west-2', 'ap-northeast-1', 'ap-northeast-2', 'ap-southeast-1', 'ap-southeast-2',  ]
+# from http://docs.aws.amazon.com/general/latest/gr/rande.html
+regions = ['us-east-1', 'us-east-2', 'us-west-1', 'us-west-2', 'ca-central-1', 'eu-central-1', 'eu-west-1', 'eu-west-2', 'ap-northeast-1', 'ap-northeast-2', 'ap-southeast-1', 'ap-southeast-2', ]
+
 
 def list_functions(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
-	print ("### Listing Lambda Functions ###")
-	try:
-		for region in regions:
-			client = boto3.client(
-				'lambda',
-				aws_access_key_id = AWS_ACCESS_KEY_ID,
-				aws_secret_access_key = AWS_SECRET_ACCESS_KEY,
-				region_name=region
-			)
+    print("### Listing Lambda Functions ###")
+    try:
+        for region in regions:
+            client = boto3.client(
+                'lambda',
+                aws_access_key_id=AWS_ACCESS_KEY_ID,
+                aws_secret_access_key=AWS_SECRET_ACCESS_KEY,
+                region_name=region
+            )
 
-			response = client.list_functions()
+            response = client.list_functions()
+
+            if response.get('Functions') is None:
+                print("{} likely does not have Lambda permissions\n" .format(AWS_ACCESS_KEY_ID))
+            elif len(response['Functions']) <= 0:
+                print("[-] ListFunctions allowed for {} but no results [-]" .format(region))
+            else:  # THIS PART IS UNTESTED
+                for r in response['Functions']:
+                    # for i in r['Instances']:
+                    pp.pprint(r)
+        print("\n")
+    except botocore.exceptions.ClientError as e:
+        print(e)
+    except KeyboardInterrupt:
+        print("CTRL-C received, exiting...")
 
-			if response.get('Functions') is None:
-				print ("{} likely does not have Lambda permissions\n" .format(AWS_ACCESS_KEY_ID))
-			elif len(response['Functions']) <= 0:
-				print ("[-] ListFunctions allowed for {} but no results [-]" .format(region))
-			else: #THIS PART IS UNTESTED
-				for r in response['Functions']: 
-				#for i in r['Instances']:
-					pp.pprint(r)
-		print ("\n")
-	except botocore.exceptions.ClientError as e:
-		print (e)
-	except KeyboardInterrupt:
-		print ("CTRL-C received, exiting...")
 
 def list_event_source_mappings(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
-	print ("### Listing Lambda Event Source Mappings ###")
-	try:
-		for region in regions:
-			client = boto3.client(
-				'lambda',
-				aws_access_key_id = AWS_ACCESS_KEY_ID,
-				aws_secret_access_key = AWS_SECRET_ACCESS_KEY,
-				region_name=region
-			)
+    print("### Listing Lambda Event Source Mappings ###")
+    try:
+        for region in regions:
+            client = boto3.client(
+                'lambda',
+                aws_access_key_id=AWS_ACCESS_KEY_ID,
+                aws_secret_access_key=AWS_SECRET_ACCESS_KEY,
+                region_name=region
+            )
 
-			response = client.list_event_source_mappings()
+            response = client.list_event_source_mappings()
 
-			if response.get('EventSourceMappings') is None:
-				print ("{} likely does not have Lambda permissions\n" .format(AWS_ACCESS_KEY_ID))
-			elif len(response['EventSourceMappings']) <= 0:
-				print ("[-] ListEventSourceMappings allowed for {} but no results [-]" .format(region))
-			else:
-				for r in response['EventSourceMappings']: 
-				#for i in r['Instances']:
-					pp.pprint(r)
-		print ("\n")
-	except botocore.exceptions.ClientError as e:
-		print (e)
-	except KeyboardInterrupt:
-		print("CTRL-C received, exiting...")
+            if response.get('EventSourceMappings') is None:
+                print("{} likely does not have Lambda permissions\n" .format(AWS_ACCESS_KEY_ID))
+            elif len(response['EventSourceMappings']) <= 0:
+                print("[-] ListEventSourceMappings allowed for {} but no results [-]" .format(region))
+            else:
+                for r in response['EventSourceMappings']:
+                    # for i in r['Instances']:
+                    pp.pprint(r)
+        print("\n")
+    except botocore.exceptions.ClientError as e:
+        print(e)
+    except KeyboardInterrupt:
+        print("CTRL-C received, exiting...")
diff --git a/modules/aws_lambda.py b/modules/aws_lambda.py
new file mode 100644
index 0000000..525b031
--- /dev/null
+++ b/modules/aws_lambda.py
@@ -0,0 +1,13 @@
+'''
+This file is used to list lambda functions and event mappings
+'''
+from libs.aws_lambda import *
+from config import AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY
+
+
+def step_lambda_list_functions():
+    list_functions(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY)
+
+
+def step_lambda_list_event_source_mappings():
+    list_event_source_mappings(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY)