Changed class level variables to instance level ones