Rule02 refactor