s1725: address code review