gofmt and some tidy-up