Made some variables class variables