Finished cleanup of storage. Fixed get bug.