storage initialization refactored