Syntax beautification, modernification, and readability "zhuzhing".

Pretty-much only stylistic changes. The original project was VERY heard to read.

![Easier To Read / collapse, etc](http://f.cl.ly/items/232x1B2X1w2g283f1K0D/Image%202013.04.23%2012%3A35%3A27%20AM.png)