Fixed a bug where we crash on symlinks. Now we only test regular files for whether they are a song which is correct behavior. Also, minor code cleanup.