#6 Correct self.variable to variable where possible