edits after code review