Continued with pep8 fixes.