Additional edits based on Brandon's feedback.