Merge pull request #573 from Masterminds/fix/goreportcard

Cleanup from go reportcard