Refactoring and javadoc updates

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