PEP8

@saimn - this is a standalone version of your PEP8 changes