I think removeRank and findAndRemoveRank should have "Pair" somewhere in the name to be more intention revealing