VE-1588: Cleanup from code review