diff --git a/src/cli.py b/src/cli.py
index 204d679..9ab67be 100755
--- a/src/cli.py
+++ b/src/cli.py
@@ -6,18 +6,15 @@ from core import scan_folder, moveHome
 from video import Video
 from exceptions import InsufficientNameError
 
-def moveHome(video):
-    print('Would have moved: {}'.format(video))
-
 def tweet(video):
     pass
 
 def prompt(name):
     manual_name = input("Insufficient name: '{}'\nInput name manually: ".format(name)) 
 
-    if manual_name is 'q':
-        assert KeyboardInterrupt
-    if manual_name is 's':
+    if manual_name == 'q':
+        raise  KeyboardInterrupt
+    if manual_name == 's':
         return None
 
 
@@ -25,7 +22,7 @@ def prompt(name):
 
 @click.command()
 @click.argument('path')
-@click.option('--daemon', '-d', daemon)
+@click.option('--daemon', '-d')
 def main(path, daemon):
     videos, insufficient_name = scan_folder(path)
 
@@ -33,22 +30,18 @@ def main(path, daemon):
         moveHome(video)
 
     while len(insufficient_name) >= 1:
-        for file in insufficient_name:
+        for i, file in enumerate(insufficient_name):
             try:
                 manual_name = prompt(file)
                 
                 if manual_name is None:
-                    insufficient_name.pop()
+                    del insufficient_name[i]
                     continue
                 
-                try:
-                    video = Video.fromguess(file, guessit(manual_name))
-                    moveHome(video)
-                    insufficient_name.pop()
+                video = Video.fromguess(file, guessit(manual_name))
+                moveHome(video)
+                del insufficient_name[i]
 
-                except InsufficientNameError:
-                    continue 
-                    
             except KeyboardInterrupt:
                 # Logger: Received interrupt, exiting parser.
                 # should the class objects be deleted ?
diff --git a/src/core.py b/src/core.py
index 71eb0f8..16e00a7 100755
--- a/src/core.py
+++ b/src/core.py
@@ -25,7 +25,7 @@ from video import VIDEO_EXTENSIONS, Episode, Movie, Video
 from subtitle import SUBTITLE_EXTENSIONS, Subtitle, get_subtitle_path
 from utils import sanitize, refine
 
-logging.basicConfig(filename=env.logfile, level=logging.DEBUG)
+logging.basicConfig(filename=env.logfile, level=logging.INFO)
 logger = logging.getLogger('seasonedParser')
 fh = logging.FileHandler(env.logfile)
 fh.setLevel(logging.INFO)
@@ -191,7 +191,7 @@ def scan_videos(path):
                 if filename.endswith(VIDEO_EXTENSIONS):  # video
                     try:
                         video = scan_video(filepath)
-                    except InsufficientInfoError as e:
+                    except InsufficientNameError as e:
                         logger.info(e)
                         insufficient_name.append(filepath)                        
                         continue