[bug 1082674] PEP8 Fixes