some refactoring, Classifier class improvement