Refactor ranking back into game state