minor cleanup around channel model.