go fmt all around, with standard settings
merge