Updated comment and logging