More pep8 fixes
Resolved merge conflicts