pep8 whitespace fixes

Nearly there...