[Refactor] Extract methods in StorageHandler

Increasing SLAP in StorageHandler