Minimal changes on Comments

Minimal changes on Comments