Some formatting cleanup in channel_spec