Ref #6: Modify comments