refactor Report Generator