Removed unnessecary variables(zipcode, etc), cleaned up some of the code, removed unused stuff