Renamed Set to Pair
Cleanup