Removed INF. Added make_pair back;

Can use numeric_limits there;