cleaned and commented date a bit