Minor cosmetic changes

Minor changes, such as running `go fmt` over the code.