gofmt and fix some stuff