task.rb code cleanup
calendar.rb code cleanup