Cleanup.
Added Pair helper.
Cleanup.