General cleanup of everything I can see right now
Okay, I swear I'm done now. ;-;
Merge pull request #29 from koalaaaa/master

General cleanup of everything I can see right now.