Simplifications in shell module
Updated classifiers