Refactoring TableTools