Tidy up
Do not map inline elements
Add comment