Cleaned up table markup