Move some comments around