Fix spacing, better datetime, remove AFP.
Merge pull request #4 from johnb30/master

Fix spacing, better datetime, remove AFP.