This all looks good, the cleanup and better separation of mixer and control logic also helps. Functionally seems to be equivalent.