Cleanup; reduced the size of storage