Some (PEP8 compliant) code cleaning.