Cleanups to whip back into shape
Merge pull request #8 from retr0h/big-cleanup

Cleanups to whip back into shape