edits from code review