Run go fmt and minor tidy