Refactoring. Prettify storage api. Rename variables