IDEX-1232: refactorings