Improve copy/paste code
Fix date formatting.