refactor & cleanup

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3069@1508710 13f79535-47bb-0310-9956-ffa450edef68