More cleaning and refactoring
Added EmailSender class