Clean storage decode/encode functions added