Eliminated "that" variable

A small refactor to remove the need for a `that` variable.