Use new date analysis features.

Signed-off-by: Sharpler <sharplermc@gmail.com>
Some clean up.

Signed-off-by: Sharpler <sharplermc@gmail.com>