Clean up and move comments around so that go fmt will do the right thing.