T99 Resolve code review comments