Trying to implement suggested changes in #202

#202 uses tabs, hopefully this works with spaces.
Trying again for #202

Didn't look right when deployed, trying again.
Still don't like the formatting
Fixed KeyNotFoundException on the message headers