Add package classifiers. Minor Cleanup