Switch from Date to Calendar

also little cleaning