small refactoring...
onedrive support