Comply (more or less) to PEP specs + simplify 1 or 2 conditions