cleanup Storage interface; comments