Use an enum to represent modal states and simplify logic