removed unneccesary comments.
further clean up.
light-waiting the code.
Merge branch 'feature/code-reflesh' into develop