PEP8

Please review, thanks.
Not tested.