Fixed some code todo with self.