Started refactoring rules