Cleaned up calendar.js