Removed some pointers indirections