Changed most uses of this to self.