move to stream based IObjectStore interface, rearrange & reformat code