More fixes for pep8