Date format refactoring + remove console.log