Checking for timestamp based on what we accept \*YYYY-MM-DD\* and doing things a bit cleaner