Merge pull request #10 from himedlooff/cleanup

Major, and I'm talking MAJOR... ... ... cleanup