Simplify timestamp handling