For ENG-6482, addressed code review comments.