A little more tidying (LocaleSwitcher)