Refactor: replace closure calling with the utility method