Refactor to use built-in