more refactoring in table