More Style
Fix merge conflicts
Style email conf