Refactoring of UpdateTimer + cleanup.