PEP8 + renames