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

\- Jonathan

__Note:__ I've signed the CLA.
No worries. I take the std lib as a style guide and think [rsc's position on names](http://research.swtch.com/names) is eminently supportable.

I come from Melbourne.