final adjustments
Revert "forgot using mapper"

This reverts commit 20c1e087df57de71de895da4be7a2a442bbfe8b1.
Revert "whitespace vs tabs"

This reverts commit a6f7d7b6092d20ae39c527fcc86be6bf89ce7b03.
Revert ""Test" for SortedIteratingSystem"

This reverts commit 9b1ea8b07ec8c13e2ea94115fc9c2a7b1377d7d3.