Removing comments and the way in which the table is constructed