T107 Resolve code review observations