Refactor more locales