#423: code review