Refactor Geo Distance