Some more pep8 improvements