Comments improvements