Overall reports refactoring