Code improvements including non-destructive table structure reuse