cleaning up some of how the locale system works