VE-831 code review cleanup