Cleanup Storage and refactor