Some further cleanup
Added example html