VE-114 cleanup from code review