Minor edits for consistency and number-formatted goals