refactored storage [ci skip]