cleaned up some whitespace issues,  and quoted the attributes