Refactor rules to give better information