improved commenting