Get rid of the @foo stuff (use self.foo instead)