VE-169 code review, performance