Run through go fmt and rename for clarity