Update for style and readability
Update for style and readability

strategicdata/MailDev,xavierpriour/MailDev,strategicdata/MailDev,AlexDpy/MailDev,strategicdata/MailDev,AlexDpy/MailDev,xavierpriour/MailDev