Cleaned up pointers a bit