Partially done. Method extracted, but not yet moved to another class.