Some more pep8 clean up