Syntax cleanup, fixed a typo in mode_demux