added 'this' to class fields