Refactoring Coverter class