html 5 doctype and some cleanup