Refactor DropboxClient