Tidy up storage