tidying up locales generation