Code improvements in Gmailer class