Change to self-closing tags

Signed-off-by: czeni <czenito@gmail.com>