Cleaned up table mess