T128 Resolve code review comments