VID-1249 Addressed some PR comments