Ran gofmt on the entire codebase and made the code more readable in a few places.

\- Jonathan

__Note:__ I've signed the CLA.
http://golang.org/doc/faq#Is_there_a_Go_programming_style_guide

Which then links to 

http://code.google.com/p/go-wiki/wiki/CodeReviewComments

Which makes the call at the bottom.

Shorter is better. Let's just use the standard.