Start refactoring the Pdf component