refactoring (T-5853)