Code alignement and comments only. No semantic modification.