fix Radu and Cosmin's comments