Made some instance variables internal