Code cleaning: PEP8 compliant