T108 Resolve code review observations