Refactor for clarity and simplicity.