reflected package change in PDF Scrutinizer, little cleanup and refactoring