minor cleanup, codecs