Merge pull request #39 from LostInBrittany/cleaning

Some cleaning and groovifying