Add feedback about migrated data
Remove spurious comment
Extract nested block in data migration