List of rules refactored