Refactoring and Report changes

also removed unused imports