Moved the comments around