Code cleaning, malloc -> calloc