PEP8 code cleanup