Fix formatting (pep8 and otherwise)