Refactoring: use function that exists