removed unnecessary commented lines