Support self closing tags
Cleanup buffers