refactor code, remove get_lat_long calls