More 'this.' removed.