removed store, added javadocs