Working extraction and analysis.
A little refactor.