TDQ-9270: Comments on refactoring.