I think everywhere else in the code we use `self` instead of `that`. Please lets try to keep consistent.