refactoring table once more