numbergame refactoring