VE-1446 Address feedback from code review