Made edits based on Eric's comments