cleanup and gofmt