comments improvment