[REFACTORING] separate storage logic