Broke out formatting into its own class, yeah.
Merge branch 'master' of github.com:/thiderman/storm