Refactor HTML & PDF writer with composite pattern
Writers refactoring fixes