Updates to the classifier and a few cleanups