Clean up city/state splitting and cleaning