Change these to instance variables