Refactored RankCheck