Some comments cleaning.