[TIMOB-3035]Addressing code review comments.