Minor cleanup using lookupChannel method