corrections mineurs + simplification