PEP8 Fixes

First batch of pep8 fixes.