Ran govet and gofmt on the code