fixed gofmt compliances - reluctantly