Changed 'this' to 'that' in private members