refactoring storages - dry re internal configuration