Slight reorganization
Fix itext styling due to caching