Removed all instances of 'this'