Refactor iText a bit more