Code cleanup; go fmt