Comments update

Removed and add comments