Simplify by handling selection logic one time