Cleaned the tables more