tidy up timestamp checks