PEP8 Cleanup

Fixes issues found when running `pep8 --ignore E501,E126,E128,E113,E712,W293 | less`