Minor refactoring related to update times