Minor updates to formatting to bring closer to pep8