Refactor out update_on_mark_complete method