Fix some minor whitespace/gofmt issues