ADTMSDK-1589: Code refactoring.