Reformat source code with IntelliJ IDEA preset

Some of this may be slightly off but it's better than it was

See http://bit.ly/spongestyle
- Incorrect use of paragraph tags
- That TODO should not be there