Overall reformat

@noblesamurai this is a great project. I did this work for my own sake, cause I needed to learn about the project.

Felt like maybe you would like the changes, so sent them your way even though I know you probably don't care about these minor changes with such a big diff.

Anyway, case you do want it here is the work.