Refactoring conversion