Improve multilanguage support and cleanup