Cleaned up calendar module.