implemented ConverterClass annotation
cleanup