indentation fixes.
changed scope of todo item listed in code comment.
shedding weight in calendar api related db query.