[NTG-context] Align with comments