Rearrange tbl_cpp to fit existing style