json date
code cleanup