use iso_time
clean up code