cleaned up in Classify