Prettify!
Moar cleanup and general fixes.
Merge pull request #26 from RWOverdijk/hotfix/PR-fixes

Prettify!