edits based on feedback from code review