Ranker slightly optimized