Some modifications of syntaxe to make the class more comprehensible