VID-2077 Responded to commends from code review