VE-1558 Address code review comments