Simplify conditional logic