incorporating comments from the code review meeting