Simplified the calendar

Less reliance on multiple sed craziness.