Simplify choice word logic