Cleaned up the calender field formatter and theme function