Cleanup + fix date