diff --git a/src/ffx/ffx_controller.py b/src/ffx/ffx_controller.py
index 51dda24..bf20f7f 100644
--- a/src/ffx/ffx_controller.py
+++ b/src/ffx/ffx_controller.py
@@ -187,10 +187,8 @@ class FfxController():
             commandSequence += denoiseTokens
 
             for td in self.__targetMediaDescriptor.getTrackDescriptors(trackType=TrackType.VIDEO):
-                if td.getCodec == TrackCodec.PNG:
-                    # commandSequence += self.generateVideoCopyTokens(td.getSubIndex())
-                    pass
-                else:
+                #HINT: Attached thumbnails are not supported by .webm container format
+                if td.getCodec != TrackCodec.PNG:
                     commandSequence += self.generateAV1Tokens(int(quality), int(preset))
 
             commandSequence += self.generateAudioEncodingTokens()
@@ -220,10 +218,8 @@ class FfxController():
             # commandSequence1 += self.__context['denoiser'].generateDenoiseTokens()
 
             for td in self.__targetMediaDescriptor.getTrackDescriptors(trackType=TrackType.VIDEO):
-                if td.getCodec == TrackCodec.PNG:
-                    # commandSequence1 += self.generateVideoCopyTokens(td.getSubIndex())
-                    pass
-                else:
+                #HINT: Attached thumbnails are not supported by .webm container format
+                if td.getCodec != TrackCodec.PNG:
                     commandSequence1 += self.generateVP9Pass1Tokens(int(quality))
 
             if self.__context['perform_crop']:
@@ -249,10 +245,8 @@ class FfxController():
             commandSequence2 += denoiseTokens
 
             for td in self.__targetMediaDescriptor.getTrackDescriptors(trackType=TrackType.VIDEO):
-                if td.getCodec == TrackCodec.PNG:
-                    # commandSequence2 += self.generateVideoCopyTokens(td.getSubIndex())
-                    pass
-                else:
+                #HINT: Attached thumbnails are not supported by .webm container format
+                if td.getCodec != TrackCodec.PNG:
                     commandSequence2 += self.generateVP9Pass2Tokens(int(quality)) 
 
             commandSequence2 += self.generateAudioEncodingTokens()
diff --git a/src/ffx/media_descriptor.py b/src/ffx/media_descriptor.py
index e060361..73c9eae 100644
--- a/src/ffx/media_descriptor.py
+++ b/src/ffx/media_descriptor.py
@@ -356,15 +356,15 @@ class MediaDescriptor:
         for trackIndex in range(len(sortedTrackDescriptors)):
 
             td: TrackDescriptor = sortedTrackDescriptors[trackIndex]
-            
+
+            #HINT: Attached thumbnails are not supported by .webm container format
             if td.getCodec() != TrackCodec.PNG:
 
                 stdi = sortedTrackDescriptors[td.getSourceIndex()].getIndex()
                 stdsi = sortedTrackDescriptors[td.getSourceIndex()].getSubIndex()
 
                 trackType = td.getType()
-                
-                # if ((trackType == TrackType.VIDEO and td.getCodec() != TrackCodec.PNG) or not only_video):
+
                 if (trackType == TrackType.VIDEO or not only_video):
 
                     importedFilePath = td.getExternalSourceFilePath()