Formatting and language tweaks.