Refactor to grant consistency.