removed unused param, fixed some comments