Manually fixed some auto pep8 style choices