Tidied up the tables