scorers: refactoring of structure