PDF and HTML clean up

Do this last.