Refactor rule builders