Removed dead code
Added doctype
Comments and removed request overriding in template