More reformatting to meet pep8