channel: refactor fe3c1c828eea7aa67da00627750c8b4312d2ecd0 and fix surrounding indentation