Clean Entities Whitespace and Comments