Fixed read from output channel + Cosmetics