T98 code review changes