cleanup

cleaning up, added assertion storageFormat is not null