gofmt and simplification of definitions