Minor language cleanup