new setup file and made class variables into instance variables