Consistently use self-closing tags where appropriate