refactored code, mainly for itests reports