Code clean up
Starting to add calendar reminder task.