- cleaned up store API