Move comments around a little