reverts broken merge
More pep8ify