T106 Resolve code review observations