VE-742 Clean-up from code review