diff --git a/core/misc.py b/core/misc.py
index 4eb9e30..0dfcfe7 100755
--- a/core/misc.py
+++ b/core/misc.py
@@ -57,7 +57,7 @@ def get_arguments():
         help='Use avconv for conversion otherwise set defaults to ffmpeg',
         action='store_true')
     parser.add_argument(
-        '-f', '--folder', default='Music/',
+        '-f', '--folder', default=(os.path.join(sys.path[0], 'Music')),
         help='path to folder where files will be stored in')
     parser.add_argument(
         '-v', '--verbose', default=False, help='show debug output',
@@ -118,7 +118,6 @@ def generate_search_url(song, viewsort=False):
 
 
 def filter_path(path):
-    os.chdir(sys.path[0])
     if not os.path.exists(path):
         os.makedirs(path)
     for temp in os.listdir(path):
diff --git a/spotdl.py b/spotdl.py
index c1ec9eb..aa7ca58 100755
--- a/spotdl.py
+++ b/spotdl.py
@@ -10,7 +10,6 @@ from slugify import slugify
 import spotipy
 import pafy
 import urllib.request
-import sys
 import os
 import time
 
@@ -222,11 +221,11 @@ def write_playlist(username, playlist_id):
             username, playlist_id, fields='tracks,next,name')
     text_file = u'{0}.txt'.format(slugify(results['name'], ok='-_()[]{}'))
 
-    print(u'Feeding {0} tracks to {1}'.format(results['tracks']['total'], text_file)) 
+    print(u'Feeding {0} tracks to {1}'.format(results['tracks']['total'], text_file))
     tracks = results['tracks']
     write_tracks(text_file, tracks)
 
-    
+
 def write_album(album):
     tracks = spotify.album_tracks(album['id'])
     text_file = u'{0}.txt'.format(slugify(album['name'], ok='-_()[]{}'))
@@ -417,9 +416,7 @@ token = misc.generate_token()
 spotify = spotipy.Spotify(auth=token)
 
 if __name__ == '__main__':
-    os.chdir(sys.path[0])
     args = misc.get_arguments()
-
     misc.filter_path(args.folder)
 
     if args.song: