New method names, new comments, new gofmt