Making code formatting consistent.

$ gofmt -s -w  && goimports -w
Merge pull request #663 from tsenart/master

Making code formatting consistent.