gofmt and cleanup