Refactor cet current date methods