Part 1 of rebase, with corrections for pep8
2 files changed