Cleanup
Add todos after findings on sample PDFs