go fmt and cleanup