Can you get rid of the `self.`s here? This will make the diff smaller.