refactor ConditionalFieldsApp