Refactor Pointer management.