Fix tables to make them more concise