[IMP] account : Improve code in reports and remove extra stuff