Refactored States and Counties