Refactor to use format any