PEP8 copliance fixes