Refactor LocalStorage

It was not reusing some methods made available in StorageHandler.