SWC-775 Update table header syntax and clean code