jen made the rest of the code review edits