remove var.
Code review changes.