[UpdateManager] Improve code a bit more again