Moved some comments around