cw3: Minor code style fixes
cw3: Refactor for multiplexer