Further cleaned up RankingService