3413: code review