Refactor classifiers