Cosmetic pep8 and cleanup stuff
Cosmetic pep8 fixes