Cleanup: go fmt and remove unused global var