Refactoring sync-console