Recommended change to remove use of 'that = this'