another round of golint cleanup