Refactor Table