Removed unnecessary comments and update header comment
Code review, header comment fix
Code review, comment update
Code review, comment update