VID-1395 Clean-up following Code Review