Updated internal methods "this" pointers to self