refactor of Storage and Executor