More cleanup and adding the classification of a single email from user.