Rework on email.js