Removed type attributes, white space