Refactor Report class