gofmt + renaming variables