clean mode added
Reporting refactored