Update Converter with code review feedback.
Merge pull request #61 from firegiant/4561-migration-feedback

Update Converter with code review feedback.