cleaned up calendar