Improved Testability (internal => public)