Refactoring to expose private methods.