Cleanup and refactoring of ride reachability stuff