Removed unnecessary pointer shuffling