refactorings + improvements for combined rule