T85 Resolve code review comments