Simplify mode selection