Refactoring for more consistency.