Out with the old...
And in with the new.
Merge pull request #3 from Mischanix/reformatted

Killed old format