* Unbreak commented out code. Heh.
* Go fmt everything.