Tidy up
Tidy up
Create and use `media` object
Do not escape HTML