cleanup
Renamed "parsing" to "extraction"