[TG] Typo and readability revision
[TG] merge