Refactoring of converter.