Removed IndexedPair class since it was unnecessary