commenting and cleanup for geo API