Improving the code a bit, removing email.