Refactored yes/no logic