Improve language and formatting