gofmt
Some minor modifications, make the code more idiomatic Go
Merge pull request #1 from broady/master

Code cleanup