Made some instance variables static