Cleaned up table to better suit our needs