Refactor to clarify