VE-870 Consolidate comments