Refactor some more
Refactor some more

Moranga/email-processor,Moranga/email-processor,Moranga/email-processor,InnovativeTravel/email-processor,InnovativeTravel/email-processor,InnovativeTravel/email-processor