fixed deal order; removed unnecessary constants