Add check for audio stream when converting to MP3
Move comment
Remove ToDo comment