Fixes for pep8 1.5