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

\- Jonathan

__Note:__ I've signed the CLA.
@kortschak

Sorry, but I disagree. IMO, `router` is better than `r` any day ... it doesn't matter if it's a small function or not. I honestly don't see what's wrong with having `router` as `r` doesn't help readability or optimize the code in any way. It only adds a potential extra step of looking up to remember what `r` is assigned to. There are only a few cases where I find this okay ... for example, when defining `http.ResponseWriter` and `*http.Request` objects, I use `res` and `req` (rather than `response` and `request`), but that's because in such a case, these short names are usually not ambiguous.

\- Jonathan

__P.S.__ Honestly though, arguing over things like this don't usually help any projects, because the reality is that everyone has their own opinions and styles when it comes to code/patterns/*et cetera*. I prefer when a project just decides on a set of code standards and contributors follow them. This is also why I like `gofmt`. So, if possible, let's discuss some code style guidelines, maybe even create some `gofmt` rules for them, and just work with that. What do you think? CC: @barakmich.