cleaning up store a bit