Reverted pep8 changes to files that don't need it
Manually fixed some auto pep8 style choices