Removal of pep8 violations. Redux