more leader board some refactoring