refactoring, before storage increase