RuleBuilder class now looking good and re-factored