some edits from code review