cleaned up setStorage