Refactored converter