Refactor Table.