[MOD] Storage code cleaned, not sure about StorageConstans