Tidying up the LocaleSwitcher class