T142 Resolve code review observations