Language and formatting fixes