Refactor: Small changes to the update service
Refactor: Removed duplicate code