Some cleaning and add number of task checked