Unifying storage key

Just a minor update so that keys aren't grabbed multiple times.