Another refactor for readability.