ComparedImagesMetadata refactoring