more annoying pep 8 underscore fixes