Quit using raw pointers, this isn't C