T110 Resolve code review observations