Cleanup comments
Revert "Cleanup comments"

This reverts commit c39dd6e566eadb3fd9bddd1957c85cf435210c5f.
Update comments
Merge remote-tracking branch 'origin/feature1'