gofmt
Some minor modifications, make the code more idiomatic Go