Minor stylistic enhancements

Haven't fixed the bug with recomputing shortest path