* removed csi.idArmour
* use CID_MAX
* coding guidelines