Extract refactor - take 2.