Formatting and pep8 pass