s1631: address comments from code review