Refactor GmailReader