more pep8 love, minor tweaks