wrapping up calendar service refactoring