Revise GazeFit class, & structure