Refactored rsync changes