Refactoring dates and working on pretty Html Trace