Changed some comments around