Format field added for PhotoModel. ClenupTask refactoring.
Storage class fix.