code cleanup
geotracking
geotracking
cleanup