Comments Improvment