Integration with pep8 changes, revert line shortening code until bugs
can be fixed