Refactor for consistency.