Moving some comments around