minor refactor for clarity/consistency