Updating and streamlining comments.