update for @mmcgrana's article and gofmt