Report refactoring and clean up