pp: handled golint's objections