from DroidDiagram to CleanTax formatter completed