Reformatted the KeyValueStore class slightly