Added this. to some variables