Use str for datetime, clean up style