Refactor timestamp value picking