some refactoring in simple_store
more refactoring in simple_store