Code cleanup.
Added create empty storage.