fixed ugly commenting