General tidy of translation API