REfactoring for better handling of state names.