Simplify the table headings
Fix indentation of the code