Refactor for Clarity