Cleaned up code.
Removed class int_pair and replaced it with std::pair