Cleaned up format, added city/state fields