[DDC-2256] Code refactorization.