Fixed data diff on existing table.
Some code cleanup