Cosmetic changes: run gofmt on all of the files as well as golint