Refactoring update!

I've included my formatter and cleanup templates, if other people want
to use them.