With testable method extracted via refactors.
Post-extraction cleanup