Various cleanup. Still trying to figure out picker default being null if no date is picked