fix closing tag
simplify structure