Smal clean-up, introduced cPickle store and load