Cleanup and go fmt
Merge branch 'master' of github:mdlayher/goat