code review comments from @shurcooL