Fix typo and clean up storage wording