replaced comments
enforcing now the right representation