code refactoring on classifiers and bugfix