Refactor of locales for misc