Pdf Report refactoring