Fixed typo
Fixed documentation
Refactored class Store