Get rid of now unused (and incorrect) "GetMediaFileFormat()"
Style fixes