Fix self closing tags. Remove debug logging