Comment improvement
More comments