Some cleaning up of the table to hide the extra data