Added new classifiers, and generally cleaned up the code