Fix order of comments