Refactoring the code
Merge branch 'master' of https://github.com/wso2/enterprise-store