modifications to classify & classificationGen for streamlining