Spic and span!
Merge pull request #34 from vonbearshark/tidyingUp

Spic and span!