Should this use `this` now that it's been moved back outside of a function?