Got rid of a duplicate include for malloc.h and improved the "do we