fixed city and state info pull
cleaned up code