Merge pull request #659 from mingrammer/gofmt

Refactor with gofmt