Fix and clean up storage calls