incorporate code review comments