VE-1207: More code review