Rankings refactoring to run faster, load faster