OWB-344 simplify and cleanup code


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