Reduce code + Fix bug game rank