Feature/format email

Fixes #62
get rid of this please