Refactoring for easier client use.