gofmt & simplification recommended by Dave Cheney.