Adjustments to pep8