Some go fmt cleanup.