made cpp statements more conforming