remove superflous closing tags
indenting and spaces fixes