Refactor to cleanup calendar code and abstract Google API a little