PEP8 violations fix