Minors change of the code