Moved comments around

Some organizing