refactoring

* now stream 2 distance calculations at once (out of 4)