some comments cleaning