Minor refactors to PDF method