Cleanup HTML::Output

work in progress