+ Calculate shortest path client
Refactor