Refactor to be more explicit