Refactoring of table element