Changed class vars to instance vars