Update Converter with code review feedback.