Tidy up
Add escape plain text formatter with tests