Moved the comments close to the tables