refactored Classifier to include feature functions