Refactor for clarity and consistency.