Added RuleConditions, cleanup