PDFBOX-1915: some minor reformat / rename / refactor

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1616843 13f79535-47bb-0310-9956-ffa450edef68