Refactor to avoid confusion.