Code formatting and remove pointless opening and closing tags. See #1207.