Cleaning up
Added Channels to facilitate min/max and average times