Did some cleaning up. Explicit references to channel numbers replaced to static ints in Util class to prevent double usage of channels