A little cleanup of rows