Refactor booleans