Refactor to reduce clutter

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