Additional Edits based on Tom's suggestions.