Cleaned up parse-emails.py a bit