Refactor iText again