[Components]: commenting and cleaning up codes
Merge branch 'master' of github.com:jaws-project/jaws