Add Order Channel, clean up code formatting