Fixed a lot of pep8 formatting...