Ran gofmt and made the various changes suggested