Ran code through gofmt finally