Cleaned up table format