HTML Cleanup

Also changed email as per RFC 2606