diff --git a/cleanup.py b/cleanup.py
index 33b379dd7..3697f180f 100644
--- a/cleanup.py
+++ b/cleanup.py
@@ -106,7 +106,10 @@ def clean_folders(*paths):
 
 def clean(*paths):
     """Clean up bytecode and obsolete folders."""
-    def _clean(*paths):
+    with WorkingDirectory(module_path()) as cwd:
+        if cwd.working_directory != cwd.original_directory:
+            print('Changing to directory:', cwd.working_directory)
+
         print('\n-- Cleaning bytecode --')
         try:
             result = clean_bytecode()
@@ -114,7 +117,8 @@ def _clean(*paths):
             print(error)
         else:
             print(result or 'No bytecode to clean')
-        if paths:
+
+        if paths and os.path.exists('.git'):
             print('\n-- Cleaning folders: {} --'.format(paths))
             try:
                 result = clean_folders(*paths)
@@ -122,13 +126,6 @@ def _clean(*paths):
                 print(error)
             else:
                 print(result or 'No folders to clean\n')
-
-    with WorkingDirectory(module_path()) as cwd:
-        if cwd.working_directory != cwd.original_directory:
-            print('Changing to directory:', cwd.working_directory)
-
-        if os.path.exists('.git'):
-            _clean(*paths)
         else:
             print('Directory is not a git repository')