Remove else line and change to date time