Removed duplication of the parsing of table rows