Code refactoring after PR code review.

TNL-814