remove superflous closing tags
indenting and spaces fixes
Merge branch 'fix/coding-standards'