slight refactor of StorageService to make public api smaller