Cleaned RulesBuilder