Refactored the code

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@152758 a5903396-d722-0410-b921-86c7d4935375
Refactored the code

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@152763 a5903396-d722-0410-b921-86c7d4935375