Some cleaning, beginning to update things change of dynamic array