Cleanup + adjust date display