Refactor final

@juriansluiman : Mandrill works as expected ! Can be merged !