Refactoring & iCloud Sync