Break update into smaller methods