Reformat and avoid duplications

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