Tidy commented out specs
Consistant quoting
Make way for future formats to be added
Move lookup out of main parse method
Have to provide formats required in block
No need to pass recipient