Perform some pointer cleanup

- Had some messy use of pointers