Made final edits based on Aaron's comments