Move the memory allocation/deallocation functions into the header and inline and make appropriate other changes as suggested by Pedro

Formatting