Removed unnecessary variables in table rows