A little cleaner for PDF and added location