golint/gofmt the code
Merge pull request #46 from nbusy/golint

golint/gofmt the code