-minor cleanups here and there, started cleanup of storeBase