refactoring and add mailtrap #47