refactoring with tables