another round of golint