#16, #68 DatePicker cleanup and format fix