Cleaned up the scripts so that the data and tables match up