Some tidying
Doing some cleanup
Minor changes
Minor changes to the playlist module