Cleanup.
Adding a DateField.

Re #24