Fixed whitespace and self closed