minor refactor for clearity