Moved the comments in the right place