Cleaned up the classifiers