[RestartFailed] Code cleanup
[UpdateManager] Little code cleanup + improved threading