One revert (comparisons with None; not PEP8, but good to check); extra comments