Changed models for geojson
cleared code a bit