change instance variables in Mailer to @mail
restructuring