HTMLFormatter updated