Fix spacing, better datetime, remove AFP.