Refactor with confidence. Made NextBest way more clean