Fix whitespace

This runs go fmt on changed files and moves around some blank lines.