Improve naming
Improve storage functions