Small language and format changes