Geofencing Refactoring & Code Cleanup