Further improve data extraction and output.