Formatting and style changes to address Colin's feedback