Renaming `that` to `self`