T141 Resolve code review observations