Refactor COnverter.java